bitkeeper revision 1.1389.1.42 (42835536rA-h77TrcPbgY_ReOoY4bQ)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk-clean

diff --cc BitKeeper/etc/ignore
index 3f65adddadb0e26ef88e0a3039b23727fef744ef,1ef3b0e2a0b83fa57899cb0679e3aff611e66738..723303c1ba41ca84da4defefbd22633a47bd7988
--- 1/BitKeeper/etc/ignore
--- 2/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@@ -58,58 -52,20 +58,59 @@@ netbsd-*-tools/
  netbsd-*-xen0/*
  netbsd-*-xenU/*
  netbsd-*.patch
 +patches/ebtables-brnf-5_vs_2.4.25.diff
 +patches/ebtables.diff
  patches/tmp/*
  pristine-*
+ ref-*
  tools/*/build/lib*/*.py
 +tools/Makefile.smh
  tools/balloon/balloon
 +tools/blktap/Makefile.smh
 +tools/blktap/blkcow
 +tools/blktap/blkcowgnbd
 +tools/blktap/blkcowimg
 +tools/blktap/blkdump
 +tools/blktap/blkgnbd
 +tools/blktap/blkimg
 +tools/blktap/blockstore.dat
 +tools/blktap/blockstored
 +tools/blktap/bstest
 +tools/blktap/parallax
 +tools/blktap/vdi.dot
 +tools/blktap/vdi.ps
 +tools/blktap/vdi_create
 +tools/blktap/vdi_fill
 +tools/blktap/vdi_list
 +tools/blktap/vdi_snap
 +tools/blktap/vdi_snap_list
 +tools/blktap/vdi_tree
 +tools/blktap/vdi_validate
 +tools/blktap/xen/*
  tools/check/.*
- tools/gdb/gdb-6.2.1/*
 +tools/cmdline/*
 +tools/cmdline/xen/*
 +tools/gdb/gdb-6.2.1-linux-i386-xen/*
++tools/gdb/gdb-6.2.1/*
 +tools/ioemu/iodev/device-model
  tools/libxc/xen/*
 +tools/misc/cpuperf/cpuperf-perfcntr
 +tools/misc/cpuperf/cpuperf-xen
 +tools/misc/mbootpack/bin2c
 +tools/misc/mbootpack/bootsect
 +tools/misc/mbootpack/bzimage_header.c
 +tools/misc/mbootpack/mbootpack
 +tools/misc/mbootpack/setup
  tools/misc/miniterm/miniterm
 +tools/misc/xc_shadow
 +tools/misc/xen_cpuperf
  tools/misc/xenperf
 +tools/tests/test_x86_emulator
  tools/vnet/gc
  tools/vnet/gc*/*
 -tools/vnet/vnet-module/.tmp_versions/*
 -tools/vnet/vnet-module/.*.cmd
  tools/vnet/vnet-module/*.ko
 +tools/vnet/vnet-module/.*.cmd
 +tools/vnet/vnet-module/.tmp_versions/*
  tools/vnet/vnet-module/vnet_module.mod.*
  tools/vnetd/vnetd
  tools/web-shutdown.tap

diff --cc buildconfigs/Rules.mk
index 58109fd619f6e62dbd6ca1263adcc58895ee1035,60b4fea1db2a455c67c0669b000d708accadabeb..11f4009525b8d62af1abceac017400fd271e3ee6
--- 1/buildconfigs/Rules.mk
--- 2/buildconfigs/Rules.mk
+++ b/buildconfigs/Rules.mk
@@@ -49,11 -53,18 +55,19 @@@ pristine-%: %.tar.bz
        tar -C tmp-$(@F) -jxf $<
        mv tmp-$(@F)/* $@
        touch $@ # update timestamp to avoid rebuild
 +      touch $@/.bk_skip
        @rm -rf tmp-$(@F)
+ 
+ OS_PATCHES = $(shell echo patches/$(OS)-$(OS_VER)/*.patch)
+ 
+ ref-%: pristine-% $(OS_PATCHES)
+       rm -rf $@
+       cp -al $< tmp-$(@F)
        [ -d patches/$* ] && \
-         for i in patches/$*/*.patch ; do ( cd $@ ; patch -p1 <../$$i ) ; done || \
+         for i in patches/$*/*.patch ; do ( cd tmp-$(@F) ; patch -p1 <../$$i ) ; done || \
          true
+       mv tmp-$(@F) $@
+       touch $@ # update timestamp to avoid rebuild
  
  %-build:
        $(MAKE) -f buildconfigs/mk.$* build
@@@ -64,10 -75,7 +78,10 @@@
  %-clean:
        $(MAKE) -f buildconfigs/mk.$* clean
  
- %-xen.patch: pristine-%
 +%-config:
 +      $(MAKE) -f buildconfigs/mk.$* config
 +
+ %-xen.patch: ref-%
        rm -rf tmp-$@
        cp -al $< tmp-$@
        ( cd $*-xen-sparse && ./mkbuildtree ../tmp-$@ ) 

diff --cc buildconfigs/mk.linux-2.4-xen0
Simple merge

diff --cc buildconfigs/mk.linux-2.4-xenU
Simple merge

diff --cc buildconfigs/mk.linux-2.6-xen0
Simple merge

diff --cc buildconfigs/mk.linux-2.6-xenU
Simple merge